From: Jim Blandy <jimb@redhat.com>
Date: Sat, 10 Apr 1993 08:04:27 +0000 (+0000)
Subject: Since Qmenu_enable is used by non-X-specific code, it shouldn't be
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~96546
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6904bdcd0874054d3992319455cf049e5f01c69d;p=emacs.git

Since Qmenu_enable is used by non-X-specific code, it shouldn't be
	defined in an X-only source file.
	* xmenu.c (Qmenu_enable): Definition moved...
	(syms_of_xmenu): ... along with initialization ...
	* keyboard.c (Qmenu_enable): ... to here ...
	(syms_of_keyboard): ... and here.
---

diff --git a/src/xmenu.c b/src/xmenu.c
index f8417be039f..bcd67ae5446 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -71,7 +71,7 @@ extern Display *x_current_display;
 #define	ButtonReleaseMask ButtonReleased
 #endif /* not HAVE_X11 */
 
-Lisp_Object Qmenu_enable;
+extern Lisp_Object Qmenu_enable;
 Lisp_Object xmenu_show ();
 extern int x_error_handler ();
 
@@ -424,9 +424,6 @@ xmenu_show (parent, startx, starty, line_list, enable_list, pane_list,
 
 syms_of_xmenu ()
 {
-  Qmenu_enable = intern ("menu-enable");
-
-  staticpro (&Qmenu_enable);
   defsubr (&Sx_popup_menu);
 }